Fix bug where we called get_surrounding on the context,. not the slave.

Thu Feb 14 11:13:22 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding):
        Fix bug where we called get_surrounding on the context,.
        not the slave.

diff --git a/ChangeLog b/ChangeLog
index 19125dda71c696066ccc2bb141ac1ad050be9df1..b496f4b59daa3c8742b546454702d51333c8d3ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 14 11:13:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): 
+       Fix bug where we called get_surrounding on the context,.
+       not the slave.
+
 Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 19125dda71c696066ccc2bb141ac1ad050be9df1..b496f4b59daa3c8742b546454702d51333c8d3ef 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Thu Feb 14 11:13:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): 
+       Fix bug where we called get_surrounding on the context,.
+       not the slave.
+
 Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 19125dda71c696066ccc2bb141ac1ad050be9df1..b496f4b59daa3c8742b546454702d51333c8d3ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Feb 14 11:13:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): 
+       Fix bug where we called get_surrounding on the context,.
+       not the slave.
+
 Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 19125dda71c696066ccc2bb141ac1ad050be9df1..b496f4b59daa3c8742b546454702d51333c8d3ef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Feb 14 11:13:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): 
+       Fix bug where we called get_surrounding on the context,.
+       not the slave.
+
 Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 19125dda71c696066ccc2bb141ac1ad050be9df1..b496f4b59daa3c8742b546454702d51333c8d3ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Feb 14 11:13:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): 
+       Fix bug where we called get_surrounding on the context,.
+       not the slave.
+
 Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 19125dda71c696066ccc2bb141ac1ad050be9df1..b496f4b59daa3c8742b546454702d51333c8d3ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Feb 14 11:13:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): 
+       Fix bug where we called get_surrounding on the context,.
+       not the slave.
+
 Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 19125dda71c696066ccc2bb141ac1ad050be9df1..b496f4b59daa3c8742b546454702d51333c8d3ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Feb 14 11:13:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): 
+       Fix bug where we called get_surrounding on the context,.
+       not the slave.
+
 Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index f95ef3e705aedfc982aba3b0535d59c313fd4e65..3abb72f24ddc88d0ab6416293dda400c070ea307 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -353,7 +353,7 @@ gtk_im_multicontext_get_surrounding (GtkIMContext  *context,
   GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
 
   if (slave)
-    return gtk_im_context_get_surrounding (context, text, cursor_index);
+    return gtk_im_context_get_surrounding (slave, text, cursor_index);
   else
     {
       if (text)